From: Keir Fraser Date: Mon, 22 Mar 2010 10:24:17 +0000 (+0000) Subject: ns16550: Do not re-init active timer on S3 resume. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12494 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=078632963422644ee3a52f7d0fecb4af1026c235;p=xen.git ns16550: Do not re-init active timer on S3 resume. Signed-off-by: Keir Fraser --- diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index f1981a24ba..3aa8e24c53 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -259,7 +259,9 @@ static void __devinit ns16550_init_postirq(struct serial_port *port) serial_async_transmit(port); - init_timer(&uart->timer, ns16550_poll, port, 0); + if ( !uart->timer.function ) + init_timer(&uart->timer, ns16550_poll, port, 0); + /* Calculate time to fill RX FIFO and/or empty TX FIFO for polling. */ bits = uart->data_bits + uart->stop_bits + !!uart->parity; uart->timeout_ms = max_t(